Introduce a cargo-doc package

diff --git a/debian/cargo-doc.doc-base b/debian/cargo-doc.doc-base
new file mode 100644 (file)
index 0000000..9f871df
--- /dev/null
+++ b/debian/cargo-doc.doc-base
@@ -0,0 +1,8 @@
+Document: cargo-rustdoc
+Title: Cargo RustDoc
+Abstract: The Cargo guide
+Section: Programming/Rust
+
+Format: HTML
+Index: /usr/share/doc/cargo/doc/index.html
+Files: /usr/share/doc/cargo/doc/*.html

diff --git a/debian/cargo-doc.docs b/debian/cargo-doc.docs
new file mode 100644 (file)
index 0000000..dcac9d9
--- /dev/null
+++ b/debian/cargo-doc.docs
@@ -0,0 +1 @@
+target/doc

diff --git a/debian/cargo.doc-base b/debian/cargo.doc-base
deleted file mode 100644 (file)
index 9f871df..0000000
--- a/debian/cargo.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: cargo-rustdoc
-Title: Cargo RustDoc
-Abstract: The Cargo guide
-Section: Programming/Rust
-
-Format: HTML
-Index: /usr/share/doc/cargo/doc/index.html
-Files: /usr/share/doc/cargo/doc/*.html

diff --git a/debian/cargo.docs b/debian/cargo.docs
deleted file mode 100644 (file)
index dcac9d9..0000000
--- a/debian/cargo.docs
+++ /dev/null
@@ -1 +0,0 @@
-target/doc

diff --git a/debian/changelog b/debian/changelog
index 8c210b299c9a9ff929d3f225ccc0984aded91f47..a594298a40dbcc5660a60df7dc3d130b256abc4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 cargo (0.6.0-2) unstable; urgency=medium
 
+  * Introduce a cargo-doc package
   * Fails to build when wget is installed. Force curl
     (Closes: #809298)
   * Add the missing VCS- fields
 
- --
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 29 Dec 2015 10:03:10 +0100
 
 cargo (0.6.0-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index fb2cad1c50b9401a728fe1f647965ded4f5e1cbc..97fbeb570f9b5022d3bad87deca7178f7346e8fd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
          rustc (>= 1.1),
          binutils,
          gcc | clang | c-compiler
+Suggests: cargo-doc
 Description: Rust package manager
  Cargo is a tool that allows Rust projects to declare their various
  dependencies, and ensure that you'll always get a repeatable build.
@@ -40,9 +41,30 @@ Description: Rust package manager
  To accomplish this goal, Cargo does four things:
   * Introduces two metadata files with various bits of project information.
   * Fetches and builds your project's dependencies.
-  * Invokes rustc or another build tool with the correct parameters to build 
+  * Invokes rustc or another build tool with the correct parameters to build
     your project.
   * Introduces conventions, making working with Rust projects easier.
  .
  Cargo downloads your Rust project’s dependencies and compiles your
  project.
+
+
+Package: cargo-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, libjs-jquery
+Description: Rust package manager, documentation
+ Cargo is a tool that allows Rust projects to declare their various
+ dependencies, and ensure that you'll always get a repeatable build.
+ .
+ To accomplish this goal, Cargo does four things:
+  * Introduces two metadata files with various bits of project information.
+  * Fetches and builds your project's dependencies.
+  * Invokes rustc or another build tool with the correct parameters to build
+    your project.
+  * Introduces conventions, making working with Rust projects easier.
+ .
+ Cargo downloads your Rust project’s dependencies and compiles your
+ project.
+ .
+ This package contains the documentation.

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 311b170..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-target/doc/*

diff --git a/debian/rules b/debian/rules
index 87fe150a68a3f3f6d9091db1a1c09354afeb7cec..2888835cf36186932802c2fdd9bd445fb13bd309 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,8 @@ override_dh_auto_build:
        # Build final cargo binary and docs
        $(MAKE)
        $(MAKE) doc
+       cd target/doc/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js
+
        # Restore from workarounds
        mv $(CURDIR)/.deps $(DEPSDIR)